320. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-05-13 09:09:07 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

320.1 Files compared

#LocationFileLast Modified
1/Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/web/css/source_tables.less2015-10-04 21:09:44 +0000
2/Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/web/css/source_tables.less2015-10-04 21:09:44 +0000

320.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged1270
Changed00
Inserted00
Removed00

320.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

320.4 Active regular expressions

No regular expressions were active.

320.5 Comparison detail

1 // /** 1 // /**
2 //  * Copyright © 2015 Magento. All rights reserved. 2 //  * Copyright © 2015 Magento. All rights reserved.
3 //  * See COPYING.txt for license details. 3 //  * See COPYING.txt for license details.
4 //  */ 4 //  */
5  5 
6 // 6 //
7 //  Common 7 //  Common
8 //  _____________________________________________ 8 //  _____________________________________________
9  9 
10 & when (@media-common = true) { 10 & when (@media-common = true) {
11     .table { 11     .table {
12         margin-bottom: 0; 12         margin-bottom: 0;
13     } 13     }
14     th.mark { 14     th.mark {
15         background-color: transparent; 15         background-color: transparent;
16     } 16     }
17     .table-wrapper { 17     .table-wrapper {
18         margin-bottom: @indent__base; 18         margin-bottom: @indent__base;
19     } 19     }
20  20 
21     table { 21     table {
22         .lib-table-caption(); 22         .lib-table-caption();
23     } 23     }
24  24 
25     .table { 25     .table {
26         tfoot { 26         tfoot {
27             border-top: 1px solid #ccc; 27             border-top: 1px solid #ccc;
28              28             
29             > tr { 29             > tr {
30                 &:first-child { 30                 &:first-child {
31                     th, 31                     th,
32                     td { 32                     td {
33                         border-top: @table__border-width @table__border-style @table__border-color; 33                         border-top: @table__border-width @table__border-style @table__border-color;
34                         padding-top: @indent__base; 34                         padding-top: @indent__base;
35                     } 35                     }
36                 } 36                 }
37             } 37             }
38             th, 38             th,
39             td { 39             td {
40                 border: 0; 40                 border: 0;
41             } 41             }
42             .mark { 42             .mark {
43                 font-weight: @font-weight__regular; 43                 font-weight: @font-weight__regular;
44                 text-align: right; 44                 text-align: right;
45             } 45             }
46         } 46         }
47     } 47     }
48 } 48 }
49  49 
50 // 50 //
51 //    Mobile 51 //    Mobile
52 //  _____________________________________________ 52 //  _____________________________________________
53  53 
54 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) { 54 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
55     .table-wrapper { 55     .table-wrapper {
56         border-top: @table__border-width @table__border-style @table__border-color; 56         border-top: @table__border-width @table__border-style @table__border-color;
57         .lib-table-overflow(); 57         .lib-table-overflow();
58         position: relative; // To hide unnecessary horizontal scrollbar in Safari 58         position: relative; // To hide unnecessary horizontal scrollbar in Safari
59         .table:not(.totals):not(.cart):not(.table-comparison) { 59         .table:not(.totals):not(.cart):not(.table-comparison) {
60             .lib-table-responsive(); 60             .lib-table-responsive();
61             tbody { 61             tbody {
62                 > tr { 62                 > tr {
63                     > td:first-child { 63                     > td:first-child {
64                         padding-top: 15px; 64                         padding-top: 15px;
65                     } 65                     }
66                     > td:last-child { 66                     > td:last-child {
67                         border-bottom: @table__border-width @table__border-style @table__border-color; 67                         border-bottom: @table__border-width @table__border-style @table__border-color;
68                         padding-bottom: 15px; 68                         padding-bottom: 15px;
69                     } 69                     }
70                     > td.col.qty { 70                     > td.col.qty {
71                         text-align: left; 71                         text-align: left;
72                     } 72                     }
73                 } 73                 }
74             } 74             }
75             &.additional-attributes { 75             &.additional-attributes {
76                 tbody { 76                 tbody {
77                     th { 77                     th {
78                         &:extend(.abs-no-display-s all); 78                         &:extend(.abs-no-display-s all);
79                     } 79                     }
80                     td { 80                     td {
81                         &:last-child { 81                         &:last-child {
82                             border: none; 82                             border: none;
83                             padding: 0 0 @indent__xs; 83                             padding: 0 0 @indent__xs;
84                         } 84                         }
85                     } 85                     }
86                 } 86                 }
87             } 87             }
88         } 88         }
89         .table:not(.totals):not(.table-comparison) { 89         .table:not(.totals):not(.table-comparison) {
90             tfoot { 90             tfoot {
91                 display: block; 91                 display: block;
92                 tr { 92                 tr {
93                     display: block; 93                     display: block;
94                     &:extend(.abs-add-clearfix-mobile all); 94                     &:extend(.abs-add-clearfix-mobile all);
95                     &:first-child { 95                     &:first-child {
96                         th, 96                         th,
97                         td { 97                         td {
98                             padding-top: @indent__base; 98                             padding-top: @indent__base;
99                         } 99                         }
100                     } 100                     }
101                 } 101                 }
102                 .mark { 102                 .mark {
103                     box-sizing: border-box; 103                     box-sizing: border-box;
104                     float: left; 104                     float: left;
105                     text-align: left; 105                     text-align: left;
106                     width: 70%; 106                     width: 70%;
107                 } 107                 }
108                 .amount { 108                 .amount {
109                     box-sizing: border-box; 109                     box-sizing: border-box;
110                     float: left; 110                     float: left;
111                     text-align: right; 111                     text-align: right;
112                     width: 30%; 112                     width: 30%;
113                 } 113                 }
114                 .grand.totals { 114                 .grand.totals {
115                     .lib-font-size(16); 115                     .lib-font-size(16);
116                     .amount { 116                     .amount {
117                         padding-bottom: @indent__s; 117                         padding-bottom: @indent__s;
118                     } 118                     }
119                 } 119                 }
120             } 120             }
121         } 121         }
122     } 122     }
123 } 123 }
124  124 
125 // 125 //
126 //  Desktop 126 //  Desktop
127 //  _____________________________________________ 127 //  _____________________________________________
128  128 
129 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__s) { 129 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__s) {
130     .table { 130     .table {
131         .lib-table-bordered( 131         .lib-table-bordered(
132             @_table_type: horizontal_body 132             @_table_type: horizontal_body
133         ); 133         );
134     } 134     }
135 } 135 }